feat: Use textconv with external diff commands #4136
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twpayne
force-pushed
the
fix-4134
branch
2 times, most recently
from
2359e38 to
2fd6dc3
Compare
|
@franzudev this is now ready for testing. Would you be able to test this? |
|
thanks for the help, still work like before. Here's the
RESULT CHECK MESSAGE
warning version dev, commit 3da4970, built at 2024-12-12T01:46:20Z
warning latest-version v2.55.0
ok os-arch darwin/arm64
ok uname Darwin Mac.station 24.0.0 Darwin Kernel Version 24.0.0: Tue Sep 24 23:37:25 PDT 2024; root:xnu-11215.1.12~1/RELEASE_ARM64_T6030 arm64
ok go-version go1.23.3 (gc)
ok executable ~/chezmoi/chezmoi
ok upgrade-method replace-executable
ok config-file ~/.config/chezmoi/chezmoi.toml, last modified 2024-12-10T18:10:57+01:00
ok source-dir ~/.local/share/chezmoi is a git working tree (clean)
ok suspicious-entries no suspicious entries
ok working-tree ~/.local/share/chezmoi is a git working tree (clean)
ok dest-dir ~ is a directory
ok umask 022
ok cd-command found /bin/zsh
ok cd-args /bin/zsh
ok diff-command found /opt/homebrew/bin/difft
ok edit-command found /opt/homebrew/bin/hx
ok edit-args /opt/homebrew/bin/hx
ok git-command found /usr/bin/git, version 2.39.5
ok merge-command found /usr/bin/vimdiff
ok shell-command found /bin/zsh
ok shell-args /bin/zsh
info age-command age not found in $PATH
ok gpg-command found /opt/homebrew/bin/gpg, version 2.4.6
ok pinentry-command found /opt/homebrew/bin/pinentry-mac, version 1.1.1
info 1password-command op not found in $PATH
ok bitwarden-command found ~/.local/bin/bw, version 2024.8.2
info bitwarden-secrets-command bws not found in $PATH
info dashlane-command dcli not found in $PATH
info doppler-command doppler not found in $PATH
info gopass-command gopass not found in $PATH
info keepassxc-command keepassxc-cli not found in $PATH
info keepassxc-db not set
info keeper-command keeper not found in $PATH
info lastpass-command lpass not found in $PATH
info pass-command pass not found in $PATH
info passhole-command ph not found in $PATH
info rbw-command rbw not found in $PATH
info vault-command vault not found in $PATH
info vlt-command vlt not found in $PATH
info secret-command not set
Let me know if you need anything else. |
|
Please share at least your config file so that other can reproduce what you see. |
here it goes: encryption = "gpg"
[data]
git_email = "user@gitserver.com"
[diff]
command = "difft"
[edit]
# https://github.com/twpayne/chezmoi/issues/3971#issuecomment-2393508601
# workaround until the helix is capable of edit hardlinks
hardlink = false
[git]
autoCommit = true
autoPush = true
[[textconv]]
pattern = "**/*.plist"
command = "plutil"
args = ["-convert", "xml1", "-o", "-", "-"]
[gpg]
recipient = "xxxxxxxxxxxxxxxx"
args = ["--quiet"]
[pinentry]
command = "pinentry-mac"
[scriptEnv]
PYTHON_REQUIRED_VERSION = "3.12"
VENV_NAME = "pyhome" |
|
After a couple of hours spent debugging, I've realized that maybe I've built it wrong or got confused with the system's one 😄 Apart from this the fix was perfect, thank you 🙏 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4134.